fix Control-E so it doesn't move to a new line each time you press it

2001-11-14  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so
	it doesn't move to a new line each time you press it

	* gtk/gtktextiter.c (gtk_text_iter_forward_to_line_end): fix
	return value, #62987

diff --git a/ChangeLog b/ChangeLog
index 25fc94d546e51998ab61ec1ef82dada9a4bb9eab..82a7066bbf79f948e7797899d0d374dc0dc31f2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-14  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so
+       it doesn't move to a new line each time you press it
+
+       * gtk/gtktextiter.c (gtk_text_iter_forward_to_line_end): fix
+       return value, #62987
+
 2001-11-14  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtextbuffer.c (main): bulk of the tests were commented

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 25fc94d546e51998ab61ec1ef82dada9a4bb9eab..82a7066bbf79f948e7797899d0d374dc0dc31f2c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2001-11-14  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so
+       it doesn't move to a new line each time you press it
+
+       * gtk/gtktextiter.c (gtk_text_iter_forward_to_line_end): fix
+       return value, #62987
+
 2001-11-14  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtextbuffer.c (main): bulk of the tests were commented

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 25fc94d546e51998ab61ec1ef82dada9a4bb9eab..82a7066bbf79f948e7797899d0d374dc0dc31f2c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2001-11-14  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so
+       it doesn't move to a new line each time you press it
+
+       * gtk/gtktextiter.c (gtk_text_iter_forward_to_line_end): fix
+       return value, #62987
+
 2001-11-14  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtextbuffer.c (main): bulk of the tests were commented

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 25fc94d546e51998ab61ec1ef82dada9a4bb9eab..82a7066bbf79f948e7797899d0d374dc0dc31f2c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2001-11-14  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so
+       it doesn't move to a new line each time you press it
+
+       * gtk/gtktextiter.c (gtk_text_iter_forward_to_line_end): fix
+       return value, #62987
+
 2001-11-14  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtextbuffer.c (main): bulk of the tests were commented

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 25fc94d546e51998ab61ec1ef82dada9a4bb9eab..82a7066bbf79f948e7797899d0d374dc0dc31f2c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2001-11-14  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so
+       it doesn't move to a new line each time you press it
+
+       * gtk/gtktextiter.c (gtk_text_iter_forward_to_line_end): fix
+       return value, #62987
+
 2001-11-14  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtextbuffer.c (main): bulk of the tests were commented

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 25fc94d546e51998ab61ec1ef82dada9a4bb9eab..82a7066bbf79f948e7797899d0d374dc0dc31f2c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2001-11-14  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so
+       it doesn't move to a new line each time you press it
+
+       * gtk/gtktextiter.c (gtk_text_iter_forward_to_line_end): fix
+       return value, #62987
+
 2001-11-14  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtextbuffer.c (main): bulk of the tests were commented

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 25fc94d546e51998ab61ec1ef82dada9a4bb9eab..82a7066bbf79f948e7797899d0d374dc0dc31f2c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2001-11-14  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_move_cursor): fix Control-E so
+       it doesn't move to a new line each time you press it
+
+       * gtk/gtktextiter.c (gtk_text_iter_forward_to_line_end): fix
+       return value, #62987
+
 2001-11-14  Havoc Pennington  <hp@redhat.com>
 
        * tests/testtextbuffer.c (main): bulk of the tests were commented

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 041ec23099a724e615bb9b48086c4c352586fcfe..5a00c1760a52bbffd3cb796458f5a92764bc0215 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -3816,7 +3816,7 @@ gtk_text_iter_forward_to_line_end (GtkTextIter *iter)
     {
       /* Move to end of this line. */
       gtk_text_iter_set_line_offset (iter, new_offset);
-      return TRUE;
+      return !gtk_text_iter_is_end (iter);
     }
   else
     {
@@ -3828,7 +3828,7 @@ gtk_text_iter_forward_to_line_end (GtkTextIter *iter)
            */
           if (!gtk_text_iter_ends_line (iter))
             gtk_text_iter_forward_to_line_end (iter);
-          return TRUE;
+          return !gtk_text_iter_is_end (iter);
         }
       else
         return FALSE;

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 5427d8fbb8f8cce2c2148e887ba346f220789b45..8017a94cf3aaf526cc7ba0bb4ceda90eb0953889 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4116,9 +4116,14 @@ gtk_text_view_move_cursor (GtkTextView     *text_view,
 
     case GTK_MOVEMENT_PARAGRAPH_ENDS:
       if (count > 0)
-        gtk_text_iter_forward_to_line_end (&newplace);
+        {
+          if (!gtk_text_iter_ends_line (&newplace))
+            gtk_text_iter_forward_to_line_end (&newplace);
+        }
       else if (count < 0)
-        gtk_text_iter_set_line_offset (&newplace, 0);
+        {
+          gtk_text_iter_set_line_offset (&newplace, 0);
+        }
       break;
 
     case GTK_MOVEMENT_BUFFER_ENDS: